mingw build system

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 44cfc1b88cb5f3e18f7264c7a0255ef533ba9845..68c759c6477742ac4e301d727a4bebab94be450c 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,7 @@
+2003-10-07  Dom Lachowicz <cinamod@hotmail.com>\r
+\r
+       * Added new mingw based build system, tidied up other missing bits\r
+       \r
 2003-10-07  Raymond Penners  <raymond@dotsphinx.com>\r
 \r
        * src/wimp_style.c: Tabs not located on top of the notebook are\r

diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
new file mode 100644 (file)
index 0000000..0644ba2
--- /dev/null
+++ b/modules/engines/ms-windows/Makefile.am
@@ -0,0 +1,23 @@
+SUBDIRS=Theme
+
+EXTRA_DIST=Makefile.msc
+
+INCLUDES=$(WIMP_CFLAGS)
+
+enginedir=$(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+
+engine_LTLIBRARIES = libwimp.la
+
+libwimp_la_SOURCES =           \
+       wimp_rc_style.c         \
+       wimp_rc_style.h         \
+       wimp_style.c            \
+       wimp_style.h            \
+       wimp_theme_main.c       \
+       xp_theme.c              \
+       xp_theme_defs.h         \
+       xp_theme.h
+
+libwimp_la_LDFLAGS = -avoid-version -module -no-undefined -export-dynamic
+libwimp_la_LIBADD= $(WIMP_LIBS)
+

diff --git a/modules/engines/ms-windows/Theme/Makefile.am b/modules/engines/ms-windows/Theme/Makefile.am
new file mode 100644 (file)
index 0000000..7e652b8
--- /dev/null
+++ b/modules/engines/ms-windows/Theme/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=gtk-2.0

diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
new file mode 100644 (file)
index 0000000..b50f710
--- /dev/null
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
@@ -0,0 +1,4 @@
+themedir = $(datadir)/themes/gtk-2.0
+theme_DATA=gtkrc
+
+EXTRA_DIST=$(theme_DATA)

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 886f197ddf455e34072bd8d8d7e6597536c968a2..7b8cbeba909fbada22b2e3191f07ee3723bd200b 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -21,17 +21,17 @@
 #include "xp_theme.h"
 
 #include <windows.h>
-#include <uxtheme.h>
-#include <tmschema.h>
 #include <math.h>
 #include <string.h>
 #include <gdk/gdkwin32.h>
 
 #include <stdio.h>
 
-/* MS defines this when it includes its schema definitions */
-#ifndef TMSCHEMA_H
+#ifdef DONT_HAVE_UXTHEME_H
 #include "xp_theme_defs.h"
+#else
+#include <uxtheme.h>
+#include <tmschema.h>
 #endif
 
 static const LPCWSTR class_descriptors[] =

diff --git a/modules/engines/ms-windows/xp_theme_defs.h b/modules/engines/ms-windows/xp_theme_defs.h
index 034cd0c49160cae555be594a53602f268b53c7f8..da7857a0046f464db2d337bfccd2ec6b9f01176c 100644 (file)
--- a/modules/engines/ms-windows/xp_theme_defs.h
+++ b/modules/engines/ms-windows/xp_theme_defs.h
@@ -19,7 +19,7 @@
  */
 
 /*
- * These are the real values of these UXTHEME constants, provided so that we can 
+ * These are the real values of these UXTHEME constants, provided so that we can
  * compile/link on Win32 platforms that aren't WinXP, and also build against
  * MinGW 1.0/1.1, which also doesn't have these things defined in its header files
  */
@@ -29,6 +29,10 @@
 
 typedef HANDLE HTHEME;
 
+#define ETDT_ENABLE         0x00000002
+#define ETDT_USETABTEXTURE  0x00000004
+#define ETDT_ENABLETAB      (ETDT_ENABLE  | ETDT_USETABTEXTURE)
+
 #define BP_PUSHBUTTON 1
 #define BP_CHECKBOX 3
 
@@ -98,6 +102,7 @@ typedef HANDLE HTHEME;
 #define ABS_UPDISABLED 4
 #define ABS_DOWNNORMAL 5
 #define ABS_DOWNHOT 6
+#define ABS_DOWNPRESSED 7
 #define ABS_DOWNDISABLED 8
 #define ABS_LEFTNORMAL 9
 #define ABS_LEFTHOT 10